Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 明细表-列分组增加 rowSpan 配置项, 用来支持自定义合并单元格 close #2150 #2159

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

feat: 明细表-列分组增加 rowSpan 配置项, 用来支持自定义合并单元格 close #2150 #2159

wants to merge 10 commits into from

Conversation

wywppkd
Copy link
Contributor

@wywppkd wywppkd commented Apr 8, 2023 •
edited by xxxxZ-zhang
Loading

👀 PR includes

✨ Feature

  • New feature

🎨 Enhance

  • Code style optimization
  • Refactoring
  • Change the UI
  • Improve the performance
  • Type optimization

🐛 Bugfix

  • Solve the issue and close #0

🔧 Chore

  • Test case
  • Docs / demos update
  • CI / workflow
  • Release version
  • Other ()

📝 Description

让明细表的列分组支持自定义合并单元格

🖼️ Screenshot

image

文档更新:
image

Before After
❌ ✅

🔗 Related issue link

close #2150

🔍 Self-Check before the merge

  • Add or update relevant docs.
  • Add or update relevant demos.
  • Add or update test case.
  • Add or update relevant TypeScript definitions.

@vercel
Copy link

vercel bot commented Apr 8, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
antvis-s2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 16, 2023 8:45am

@github-actions github-actions bot added the pr(feature) new feature label Apr 8, 2023
@codecov
Copy link

codecov bot commented Apr 8, 2023 •
edited
Loading

Codecov Report

Patch coverage: 76.03% and project coverage change: -0.06 ⚠️

Comparison is base (1adc25d) 76.48% compared to head (2a22ccb) 76.43%.

❗ Current head 2a22ccb differs from pull request most recent head d98268f. Consider uploading reports for the commit d98268f to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #2159      +/-   ##
==========================================
- Coverage   76.48%   76.43%   -0.06%     
==========================================
  Files         240      240              
  Lines       12312    12410      +98     
  Branches     2630     2659      +29     
==========================================
+ Hits         9417     9485      +68     
+ Misses       1377     1371       -6     
- Partials     1518     1554      +36
Impacted Files Coverage Δ
packages/s2-core/src/cell/col-cell.ts 89.05% <ø> (-0.16%) ⬇️
packages/s2-core/src/cell/corner-cell.ts 83.16% <ø> (+0.47%) ⬆️
packages/s2-core/src/cell/table-col-cell.ts 86.53% <ø> (+4.72%) ⬆️
packages/s2-core/src/data-set/base-data-set.ts 94.11% <ø> (+0.56%) ⬆️
packages/s2-core/src/data-set/pivot-data-set.ts 72.39% <0.00%> (-0.73%) ⬇️
packages/s2-core/src/theme/index.ts 92.30% <ø> (-7.70%) ⬇️
packages/s2-core/src/cell/header-cell.ts 67.08% <50.00%> (-0.63%) ⬇️
packages/s2-core/src/utils/export/index.ts 72.36% <50.00%> (+0.12%) ⬆️
packages/s2-core/src/cell/data-cell.ts 73.96% <66.66%> (+0.15%) ⬆️
...ckages/s2-core/src/interaction/event-controller.ts 82.50% <66.66%> (+0.13%) ⬆️
... and 15 more

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@lijinke666 lijinke666 added the 🙏 need test cases or docs 需要单元测试或者补充文档 label Apr 13, 2023
@github-actions
Copy link
Contributor

你好 @wywppkd，感谢你的贡献, 为了让代码更健壮, 请补充相应单元测试, 如果有 API 改动, 请修改 相应的文档

Hello, @wywppkd, Thanks for your contribution. In order to make the code more robust, please add the corresponding unit tests, and update the docs if there are API changes.

@lijinke666
Copy link
Member

请增加一个相应的 demo 和对应的单测

@lijinke666 lijinke666 mentioned this pull request Apr 28, 2023
Merged
18 tasks
@wywppkd wywppkd force-pushed the feat-tablesheet-muliheaders branch from 0de7a1b to 4ae5765 Compare May 11, 2023 09:55
@wywppkd wywppkd force-pushed the feat-tablesheet-muliheaders branch from f5b8229 to 5b89709 Compare May 11, 2023 11:25
@wywppkd
Copy link
Contributor Author

wywppkd commented May 11, 2023 •
edited
Loading

请增加一个相应的 demo 和对应的单测

已经增加了示例 demo: http://localhost:8000/examples/basic/table#table-column-group-customize-cell

image

@wywppkd
Copy link
Contributor Author

wywppkd commented May 18, 2023

请增加一个相应的 demo 和对应的单测

单测也加上了

@wywppkd wywppkd requested a review from wjgogogo May 24, 2023 06:31
@wywppkd wywppkd force-pushed the feat-tablesheet-muliheaders branch from 37c4d90 to 1fdd091 Compare May 27, 2023 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GaoFuhong GaoFuhong Awaiting requested review from GaoFuhong

@lcx-seima lcx-seima Awaiting requested review from lcx-seima

@lijinke666 lijinke666 Awaiting requested review from lijinke666

@serializedowen serializedowen Awaiting requested review from serializedowen

@stone-lyl stone-lyl Awaiting requested review from stone-lyl

@wjgogogo wjgogogo Awaiting requested review from wjgogogo

At least 1 approving review is required to merge this pull request.

Assignees

@wywppkd wywppkd

Labels
🙏 need test cases or docs 需要单元测试或者补充文档 pr(feature) new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

🙏 明细表-多表头能不能支持自定义合并
3 participants
@wywppkd @lijinke666 @wjgogogo